Revision: tla--integration--1.1--patch-43
Archive: rbtcollins@hotmail.com--barch
Creator: Robert Collins <rbtcollins@hotmail.com>
Date: Sat Dec 20 15:03:37 EST 2003
Standard-date: 2003-12-20 04:03:37 GMT
New-files: PLUGIN/auto libarch/editor.c libarch/editor.h
Modified-files: ChangeLog libarch/cmd-build-config.c
    libarch/cmd-commit.c libarch/cmd-get.c
    libarch/cmd-star-merge.c libarch/configs.c
    libarch/library-txn.c
New-patches: lord@emf.net--2003b/tla--devo--1.1--patch-282
    lord@emf.net--2003b/tla--devo--1.1--patch-283
    lord@emf.net--2003b/tla--devo--1.1--patch-284
    lord@emf.net--2003b/tla--devo--1.1--patch-285
    lord@emf.net--2003b/tla--devo--1.1--patch-286
    rbtcollins@hotmail.com--barch/tla--integration--1.1--patch-43
    walters@verbum.org--2003/tla--lifeless-integration--1.1--patch-7
    walters@verbum.org--2003/tla--mainline--1.1--patch-56
    walters@verbum.org--2003/tla--mainline--1.1--patch-57
Summary: merge with lord@emf.net--200b/tla--devo--1.0

Patches applied:

 * lord@emf.net--2003b/tla--devo--1.1--patch-282
   $EDITOR support (walters, rbcollins)

 * lord@emf.net--2003b/tla--devo--1.1--patch-283
   no guessing at $EDITOR

 * lord@emf.net--2003b/tla--devo--1.1--patch-284
   command line processing in star-merge (walters)

 * lord@emf.net--2003b/tla--devo--1.1--patch-285
   --links => --link

 * lord@emf.net--2003b/tla--devo--1.1--patch-286
   make sure diff and diff3 are good during config

 * mt@wmipf.in-berlin.de--devel-2003/tla--wmipf--1.1--patch-26
   add function arch_tree_file_relpath

 * mt@wmipf.in-berlin.de--devel-2003/tla--wmipf--1.1--patch-27
   use arch_tree_file_relpath

 * walters@verbum.org--2003/tla--lifeless-integration--1.1--patch-7
   use $EDITOR for "tla commit"

 * walters@verbum.org--2003/tla--mainline--1.1--patch-56
   pull $EDITOR on "tla commit" from lifeless-integration

 * walters@verbum.org--2003/tla--mainline--1.1--patch-57
   star-merge archive defaults to tree-version archive

